Merge with ia64/xen-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 17 Aug 2007 15:48:10 +0000 (16:48 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 17 Aug 2007 15:48:10 +0000 (16:48 +0100)

Trivial merge